Changeset 9614

Timestamp:

05/11/08 03:19:59 (3 months ago)

Author:

bct

Message:

merged in session_centric branch

Files:

• trunk/src/chat_control.py (modified) (56 diffs)
• trunk/src/common/connection_handlers.py (modified) (19 diffs)
• trunk/src/common/events.py (modified) (2 diffs)
• trunk/src/common/gajim.py (modified) (2 diffs)
• trunk/src/common/stanza_session.py (modified) (8 diffs)
• trunk/src/common/zeroconf/connection_handlers_zeroconf.py (modified) (2 diffs)
• trunk/src/gajim.py (modified) (21 diffs)
• trunk/src/groupchat_control.py (modified) (14 diffs)
• trunk/src/message_control.py (modified) (4 diffs)
• trunk/src/message_window.py (modified) (12 diffs)
• trunk/src/notify.py (modified) (2 diffs)
• trunk/src/roster_window.py (modified) (20 diffs)
• trunk/src/session.py (added)
• trunk/src/tictactoe.py (added)
• trunk/src/vcard.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -7 +7 @@
-## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
-##                    Julien Pivotto <roidelapluie@gmail.com>
- 
+
-##
-## This file is part of Gajim.
@@ -105 +105 @@
-
-        def draw_banner(self):
- 
- 
+
+
-                '''
-                self.draw_banner_text()
@@ -134 +134 @@
-                helpers.launch_browser_mailer('url', url)
-
- 
+
-        resource = None):
-                MessageControl.__init__(self, type_id, parent_win, widget_name,
@@ -239 +239 @@
-                        gtk.DEST_DEFAULT_HIGHLIGHT,
-                        self.dnd_list, gtk.gdk.ACTION_COPY)
-
+
-                self.update_font()
-
@@ -267 +267 @@
-                                # iterating on a copy
-                                for lang in dict(langs):
- 
+
-                                                spell.set_language(langs[lang])
-                                        except:
@@ -331 +331 @@
-                menu.show_all()
-
- 
+
-        def _on_banner_eventbox_button_press_event(self, widget, event):
-                '''If right-clicked, show popup'''
@@ -363 +363 @@
-                self.disconnect_style_event(self.banner_status_label)
-                if bgcolor:
- 
+
-                                gtk.gdk.color_parse(bgcolor))
-                        default_bg = False
@@ -392 +392 @@
-                        widget.disconnect(id)
-                        del self.handlers[id]
-
+
-        def connect_style_event(self, widget, set_fg = False, set_bg = False):
-                self.disconnect_style_event(widget)
@@ -399 +399 @@
-
-        def _on_style_set_event(self, widget, style, *opts):
- 
+
-                        opts[0] == True -> set fg color
-                        opts[1] == True -> set bg color'''
@@ -565 +565 @@
-                                else: # ENTER
-                                        send_message = True
-
+
-                        if gajim.connections[self.account].connected < 2: # we are not connected
-                                dialogs.ErrorDialog(_('A connection is not available'),
@@ -645 +645 @@
-                max_size = gajim.config.get('key_up_lines')
-                if size >= max_size:
- 
+
-                                self.sent_history[i] = self.sent_history[i + 1]
-                        self.sent_history[max_size - 1] = message
@@ -694 +694 @@
-                                # we want to have save this message in events list
-                                # other_tags_for_text == ['marked'] --> highlighted gc message
-                                type_ = 'printed_' + self.type_id
-                                event = 'message_received'
-                                if gc_message:
-                                        if 'marked' in other_tags_for_text:
@@ -702 +700 @@
-                                                type_ = 'printed_gc_msg'
-                                        event = 'gc_message_received'
+                                else:
+                                        type_ = 'printed_' + self.type_id
+                                        event = 'message_received'
-                                show_in_roster = notify.get_show_in_roster(event,
-
+, self.session
-                                show_in_systray = notify.get_show_in_systray(event,
-                                        self.account, self.contact, type_)
+
-                                event = gajim.events.create_event(type_, None,
-                                        show_in_roster = show_in_roster,
@@ -723 +725 @@
-                kind in ('incoming', 'incoming_queue'):
-                        self.parent_win.redraw_tab(self)
-                        ctrl = gajim.interface.msg_win_mgr.get_control(full_jid, self.account)
-                        if not self.parent_win.is_active():
-ctrl
+self
-                        else:
-ctrl
+self
-
-        def toggle_emoticons(self):
@@ -857 +858 @@
-                # we don't want to always resize in height the message_textview
-                # so we have minimum on conversation_textview's scrolled window
- 
+
-                # minimum for conversation_textview and maximum for message_textview
-                # we set to automatic the scrollbar policy
@@ -868 +869 @@
-                                        # scroll only when scrollbar appear
-                                        if policy != gtk.POLICY_AUTOMATIC:
- 
+
-                                                        gtk.POLICY_AUTOMATIC)
- 
+
-                                                        message_height + conversation_height - min_height)
-                                                self.bring_scroll_to_end(msg_textview)
-                        else:
- 
+
-                                        gtk.POLICY_NEVER)
-                                self.msg_scrolledwindow.set_property('height-request', -1)
@@ -884 +885 @@
-                # if message we have in message_textview is too big
-                if requisition.width > message_width:
- 
+
-                                gtk.POLICY_AUTOMATIC)
-                else:
- 
+
-                                gtk.POLICY_NEVER)
-
@@ -917 +918 @@
-
-                if not len(gajim.events.get_events(self.account, jid, types_list)):
- 
+
-                if not self.parent_win:
-                        return
@@ -924 +925 @@
-                self.parent_win.window.is_active():
-                        # we are at the end
-
-
+
-                                # There were events to remove
-                                self.redraw_after_event_removed(jid)
-
-        def redraw_after_event_removed(self, jid):
- 
+
-                gc_roster and titles in roster and msg_win '''
-                self.parent_win.redraw_tab(self)
@@ -937 +937 @@
-                if self.type_id == message_control.TYPE_PM:
-                        room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
-
+gc_
-                                room_jid, self.account)
-                        if room_jid in gajim.interface.minimized_controls[self.account]:
@@ -948 +948 @@
-                                gajim.interface.roster.draw_contact(room_jid, self.account)
-                        groupchat_control.draw_contact(nick)
-
-
-
+
+
-                else:
-                        gajim.interface.roster.draw_contact(jid, self.account)
@@ -956 +955 @@
-
-        def sent_messages_scroll(self, direction, conv_buf):
- 
+
-                if self.orig_msg is None:
-                        # user was typing something and then went into history, so save
@@ -1054 +1053 @@
-                self.widget_set_visible(self.xml.get_widget('banner_eventbox'),
-                        gajim.config.get('hide_chat_banner'))
-
+
-                # Add lock image to show chat encryption
-                self.lock_image = self.xml.get_widget('lock_image')
@@ -1081 +1080 @@
-                gajim.connections[self.account].is_zeroconf:
-                        convert_to_gc_button.set_sensitive(False)
-
+
-                # keep timeout id and window obj for possible big avatar
-                # it is on enter-notify and leave-notify so no need to be per jid
@@ -1127 +1126 @@
-                        msg = _('GPG encryption enabled')
-                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
-
+
-                        if self.session:
-                                self.session.loggable = gajim.config.get('log_encrypted_sessions')
-                        self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and \
-                                        self.session.is_loggable())
-
+
-                self.status_tooltip = gtk.Tooltips()
-
@@ -1155 +1154 @@
-                avatar_w = avatar_pixbuf.get_width()
-                avatar_h = avatar_pixbuf.get_height()
-
+
-                scaled_buf = self.xml.get_widget('avatar_image').get_pixbuf()
-                scaled_buf_w = scaled_buf.get_width()
-                scaled_buf_h = scaled_buf.get_height()
-
+
-                # do we have something bigger to show?
-                if avatar_w > scaled_buf_w or avatar_h > scaled_buf_h:
@@ -1165 +1164 @@
-                        self.show_bigger_avatar_timeout_id = gobject.timeout_add(500,
-                                self.show_bigger_avatar, widget)
-
+
-        def on_avatar_eventbox_leave_notify_event(self, widget, event):
-                '''we left the eventbox area that holds the avatar img'''
@@ -1177 +1176 @@
-                        menu = gtk.Menu()
-                        menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS)
- 
+
-                                gtkgui_helpers.on_avatar_save_as_menuitem_activate,
-                                self.contact.jid, self.account, self.contact.get_shown_name() + \
@@ -1184 +1183 @@
-                        menu.append(menuitem)
-                        menu.show_all()
-   
+
-                        # show the menu
-                        menu.show_all()
@@ -1269 +1268 @@
-
-        def draw_banner_text(self):
- 
- 
+
+
-                '''
-                contact = self.contact
@@ -1277 +1276 @@
-                banner_name_label = self.xml.get_widget('banner_name_label')
-                banner_eventbox = self.xml.get_widget('banner_eventbox')
-
+
-                name = contact.get_shown_name()
-                if self.resource:
@@ -1364 +1363 @@
-                        self.gpg_is_active = False
-                        msg = _('GPG encryption disabled')
- 
+
-                        if self.session:
-                                self.session.loggable = True
@@ -1389 +1388 @@
-                gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled',
-                        self.gpg_is_active)
-
+
-                self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and \
-                                self.session.is_loggable())
-
+
-        def _show_lock_image(self, visible, enc_type = '', enc_enabled = False, chat_logged = False):
- 
+
-                status_string = enc_enabled and 'is' or 'is NOT'
-                logged_string = chat_logged and 'will' or 'will NOT'
@@ -1550 +1549 @@
-                # True refresh 30 seconds vars too or else it's 30 - 5 = 25 seconds!
-                self.reset_kbd_mouse_timeout_vars()
-             
+
-
-        def check_for_possible_inactive_chatstate(self, arg):
@@ -1602 +1601 @@
-                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
-                self._show_lock_image(e2e_is_active, 'E2E', e2e_is_active, self.session and \
- 
+
-
-        def print_conversation(self, text, frm='', tim=None, encrypted=False,
@@ -1626 +1625 @@
-                                if not encrypted:
-                                        msg = _('The following message was NOT encrypted')
- 
+
-                                                'status', '', tim)
-                        else:
@@ -1632 +1631 @@
-                                if encrypted and not self.gpg_is_active:
-                                        msg = _('The following message was encrypted')
- 
+
-                                                'status', '', tim)
-                                        self._toggle_gpg()
@@ -1673 +1672 @@
-                        unread = '[' + unicode(num_unread) + ']'
-
- 
+
-                theme = gajim.config.get('roster_theme')
-                color = None
@@ -1701 +1700 @@
-                else: # active or not chatstate, get color from gtk
-                        color = self.parent_win.notebook.style.fg[gtk.STATE_ACTIVE]
-
+
-
-                name = self.contact.get_shown_name()
@@ -1720 +1719 @@
-                # Set tab image (always 16x16); unread messages show the 'event' image
-                tab_img = None
-
+
-                if num_unread and gajim.config.get('show_unread_tab_icon'):
-                        img_16 = gajim.interface.roster.get_appropriate_state_images(
@@ -1761 +1760 @@
-                muc_icon = gtkgui_helpers.load_icon('muc_active')
-                if muc_icon:
- 
+
-
-                ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
@@ -1775 +1774 @@
-                contact = self.parent_win.get_active_contact()
-                jid = contact.jid
-
+
-                # check if we support and use gpg
-                if not gajim.config.get_per('accounts', self.account, 'keyid') or\
@@ -1815 +1814 @@
-
-                # connect signals
- 
+
-                        self._on_history_menuitem_activate)
-                self.handlers[id] = history_menuitem
- 
+
-                        self._on_send_file_menuitem_activate)
- 
+
-                id = add_to_roster_menuitem.connect('activate',
-                        self._on_add_to_roster_menuitem_activate)
@@ -1827 +1826 @@
-                        self._on_toggle_gpg_menuitem_activate)
-                self.handlers[id] = toggle_gpg_menuitem
- 
+
-                        self._on_toggle_e2e_menuitem_activate)
- 
- 
+
+
-                        self._on_contact_information_menuitem_activate)
-                self.handlers[id] = information_menuitem
@@ -1886 +1885 @@
-                # this function checks for that and just returns so it's safe to call it
-                # with same state.
-
+
-                # This functions also checks for violation in state transitions
-                # and raises RuntimeException with appropriate message
@@ -1915 +1914 @@
-                        return
-
- 
+
-                # the current state (contact.our_chatstate) then return
-                if contact.our_chatstate == state:
@@ -1927 +1926 @@
-                        # for that procedure so return to make sure we send only once
-                        # 'active' until we know peer supports jep85
- 
+
-
-                if contact.our_chatstate == 'ask':
@@ -1947 +1946 @@
-                        contact.our_chatstate = 'active'
-                        self.reset_kbd_mouse_timeout_vars()
-
+
-                # if we're inactive prevent composing (JEP violation)
-                elif contact.our_chatstate == 'inactive' and state == 'composing':
@@ -1964 +1963 @@
-                # destroy banner tooltip - bug #pygtk for that!
-                self.status_tooltip.destroy()
+
-                # Send 'gone' chatstate
-                self.send_chatstate('gone', self.contact)
-                self.contact.chatstate = None
-                self.contact.our_chatstate = None
+
+                # terminate session
+                self.session.control = None
+
-                # Disconnect timer callbacks
-                gobject.source_remove(self.possible_paused_timeout_id)
@@ -1987 +1991 @@
-
-        def allow_shutdown(self, method):
+                print repr(self.get_full_jid())
+                print repr(gajim.last_message_time[self.account])
-                if time.time() - gajim.last_message_time[self.account]\
-                [self.get_full_jid()] < 2:
@@ -2174 +2180 @@
-                        self.print_esession_details()
-
-                # Is it a pm ?
-                is_pm = False
-                room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
-                control = gajim.interface.msg_win_mgr.get_control(room_jid, self.account)
-                if control and control.type_id == message_control.TYPE_GC:
-                        is_pm = True
-                # list of message ids which should be marked as read
-                message_ids = []
@@ -2204 +2204 @@
-
-                typ = 'chat' # Is it a normal chat or a pm ?
+
-                # reset to status image in gc if it is a pm
-
+
+
+
+
+
-                        control.update_ui()
-                        control.parent_win.show_title()
@@ -2266 +2271 @@
-                if gtk.gtk_version >= (2, 10, 0) and gtk.pygtk_version >= (2, 10, 0):
-                        window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
-
+
-                window.realize()
-                window.window.set_back_pixmap(pixmap, False) # make it transparent
-                window.window.shape_combine_mask(mask, 0, 0)
-
- 
+
-                x0, y0 = small_avatar.window.get_origin()
-                x0 += small_avatar.allocation.x
@@ -2277 +2282 @@
-                center_x= x0 + (small_avatar.allocation.width / 2)
-                center_y = y0 + (small_avatar.allocation.height / 2)
- 
+
-                window.move(pos_x, pos_y)
-                # make the cursor invisible so we can see the image
@@ -2308 +2313 @@
-                else:
-                        c = self.contact
- 
+
-                        self.account, c)
-
@@ -2318 +2323 @@
-
-        def _on_toggle_gpg_menuitem_activate(self, widget):
-     
+
-
-        def _on_convert_to_gc_menuitem_activate(self, widget):

trunk/src/common/connection_handlers.py

@@ -50 +50 @@
-        from music_track_listener import MusicTrackListener
-
-
+
+
-
-STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd',
@@ -995 +996 @@
-
-                self.awaiting_answers[id] = (VCARD_PUBLISHED, iq2)
-
+
-        def _IqCB(self, con, iq_obj):
-                id = iq_obj.getID()
@@ -1047 +1048 @@
-                        if iq_obj.getType() == 'error' and jid == our_jid:
-                                # our server doesn't support vcard
+                                gajim.log.debug('xxx error xxx')
-                                self.vcard_supported = False
-                        if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error':
@@ -1262 +1264 @@
-
-                        con.send(reply)
-
+
-                raise common.xmpp.NodeProcessed
-
@@ -1292 +1294 @@
-                errcode = iq_obj.getErrorCode()
-                self.dispatch('ERROR_ANSWER', (id, jid_from, errmsg, errcode))
-
+
-        def _PrivateCB(self, con, iq_obj):
-                '''
@@ -1500 +1502 @@
-        def _messageCB(self, con, msg):
-                '''Called when we receive a message'''
+                gajim.log.debug('MessageCB')
+
-                frm = helpers.get_full_jid_from_iq(msg)
-                mtype = msg.getType()
@@ -1507 +1511 @@
-                        mtype = 'normal'
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                        if thread_id and not session.received_thread_id:
@@ -1517 +1536 @@
-                        self._pubsubEventCB(con, msg)
-                        return
-
-if msg.getTag('confirm') and msg.getTag('confirm').namespace == \
-common.xmpp.NS_HTTP_AUTH
+
+# check if the message is a XEP-0070 confirmation request
+if msg.getTag('confirm', namespace=common.xmpp.NS_HTTP_AUTH)
-                        self._HttpAuthCB(con, msg)
-                        return
-
-
+
+
+
-                        if gajim.HAVE_PYCRYPTO:
-                                self._FeatureNegCB(con, msg, session)
-                        return
-
-
+
-                        self._InitE2ECB(con, msg, session)
-
+
-                encrypted = False
-                tim = msg.getTimestamp()
@@ -1536 +1555 @@
-                tim = localtime(timegm(tim))
-
-
-
+
-                        encrypted = True
-
@@ -1543 +1561 @@
-                                msg = session.decrypt_stanza(msg)
-                        except:
-
+, session
-
-                msgtxt = msg.getBody()
-                msghtml = msg.getXHTML()
-                subject = msg.getSubject() # if not there, it's None
-
-
-
+
-                frm = helpers.get_full_jid_from_iq(msg)
-                jid = helpers.get_jid_from_iq(msg)
+
-                addressTag = msg.getTag('addresses', namespace = common.xmpp.NS_ADDRESS)
+
-                # Be sure it comes from one of our resource, else ignore address element
-                if addressTag and jid == gajim.get_jid_from_account(self.name):
@@ -1560 +1577 @@
-                                frm = address.getAttr('jid')
-                                jid = gajim.get_jid_without_resource(frm)
-
-
-
-
-
-
-
-
+
-                # invitations
-                invite = None
+                encTag = msg.getTag('x', namespace=common.xmpp.NS_ENCRYPTED)
+
-                if not encTag:
-                        invite = msg.getTag('x', namespace = common.xmpp.NS_MUC_USER)
-                        if invite and not invite.getTag('invite'):
-                                invite = None
-
-
-
+
-                # FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) do NOT RECOMMENDED
-                # invitation
@@ -1590 +1600 @@
-                                        is_continued))
-                                return
-                form_node = None
-                for xtag in xtags:
-                        if xtag.getNamespace() == common.xmpp.NS_DATA:
-                                form_node = xtag
-                                break
-                # chatstates - look for chatstate tags in a message if not delayed
-                if not delayed:
-                        composing_xep = False
-                        children = msg.getChildren()
-                        for child in children:
-                                if child.getNamespace() == 'http://jabber.org/protocol/chatstates':
-                                        chatstate = child.getName()
-                                        composing_xep = 'XEP-0085'
-                                        break
-                        # No XEP-0085 support, fallback to XEP-0022
-                        if not chatstate:
-                                chatstate_child = msg.getTag('x', namespace = common.xmpp.NS_EVENT)
-                                if chatstate_child:
-                                        chatstate = 'active'
-                                        composing_xep = 'XEP-0022'
-                                        if not msgtxt and chatstate_child.getTag('composing'):
-                                                chatstate = 'composing'
-                # XEP-0172 User Nickname
-                user_nick = msg.getTagData('nick')
-                if not user_nick:
-                        user_nick = ''
-
-                if encTag and self.USE_GPG:
-                        #decrypt
-                        encmsg = encTag.getData()
-
@@ -1625 +1608 @@
-                                decmsg = self.gpg.decrypt(encmsg, keyID)
-                                # \x00 chars are not allowed in C (so in GTK)
-
-
-
-
+
+
-                if mtype == 'error':
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                elif mtype == 'groupchat':
-
-
-
-
-
+
+