Changeset 9616

Timestamp:

05/11/08 15:17:28 (4 months ago)

Author:

js

Message:

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@… 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.

Location:

trunk/src

Files:

• chat_control.py (modified) (56 diffs)
• common/connection_handlers.py (modified) (19 diffs)
• common/events.py (modified) (2 diffs)
• common/gajim.py (modified) (2 diffs)
• common/pep.py (modified) (1 diff)
• common/stanza_session.py (modified) (8 diffs)
• common/zeroconf/connection_handlers_zeroconf.py (modified) (2 diffs)
• gajim.py (modified) (22 diffs)
• groupchat_control.py (modified) (14 diffs)
• message_control.py (modified) (4 diffs)
• message_window.py (modified) (12 diffs)
• notify.py (modified) (2 diffs)
• roster_window.py (modified) (20 diffs)
• session.py (deleted)
• tictactoe.py (deleted)
• 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>
-##                    Stephan Erb <steve-e@h3c.de>
+##                    Stephan Erb <steve-e@h3c.de> 
 ##
 ## This file is part of Gajim.
@@ -105 +105 @@
 
         def draw_banner(self):
-                '''Draw the fat line at the top of the window that
-                houses the icon, jid, ...
+                '''Draw the fat line at the top of the window that 
+                houses the icon, jid, ... 
                 '''
                 self.draw_banner_text()
@@ -134 +134 @@
                 helpers.launch_browser_mailer('url', url)
 
-        def __init__(self, type_id, parent_win, widget_name, contact, acct,
+        def __init__(self, type_id, parent_win, widget_name, contact, acct, 
         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):
-                                        try:
+                                        try: 
                                                 spell.set_language(langs[lang])
                                         except:
@@ -331 +331 @@
                 menu.show_all()
 
-        # moved from ChatControl
+        # moved from ChatControl 
         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:
-                        banner_eventbox.modify_bg(gtk.STATE_NORMAL,
+                        banner_eventbox.modify_bg(gtk.STATE_NORMAL, 
                                 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):
-                '''set style of widget from style class *.Frame.Eventbox
+                '''set style of widget from style class *.Frame.Eventbox 
                         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:
-                        for i in xrange(0, size - 1):
+                        for i in xrange(0, size - 1): 
                                 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:
@@ -700 +702 @@
                                                 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.account, self.contact, self.session)
+                                        self.account, self.contact)
                                 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,
@@ -725 +723 @@
                 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():
-                                self.parent_win.show_title(True, self) # Enabled Urgent hint
+                                self.parent_win.show_title(True, ctrl) # Enabled Urgent hint
                         else:
-                                self.parent_win.show_title(False, self) # Disabled Urgent hint
+                                self.parent_win.show_title(False, ctrl) # Disabled Urgent hint
 
         def toggle_emoticons(self):
@@ -858 +857 @@
                 # we don't want to always resize in height the message_textview
                 # so we have minimum on conversation_textview's scrolled window
-                # but we also want to avoid window resizing so if we reach that
+                # but we also want to avoid window resizing so if we reach that 
                 # minimum for conversation_textview and maximum for message_textview
                 # we set to automatic the scrollbar policy
@@ -869 +868 @@
                                         # scroll only when scrollbar appear
                                         if policy != gtk.POLICY_AUTOMATIC:
-                                                self.msg_scrolledwindow.set_property('vscrollbar-policy',
+                                                self.msg_scrolledwindow.set_property('vscrollbar-policy', 
                                                         gtk.POLICY_AUTOMATIC)
-                                                self.msg_scrolledwindow.set_property('height-request',
+                                                self.msg_scrolledwindow.set_property('height-request', 
                                                         message_height + conversation_height - min_height)
                                                 self.bring_scroll_to_end(msg_textview)
                         else:
-                                self.msg_scrolledwindow.set_property('vscrollbar-policy',
+                                self.msg_scrolledwindow.set_property('vscrollbar-policy', 
                                         gtk.POLICY_NEVER)
                                 self.msg_scrolledwindow.set_property('height-request', -1)
@@ -885 +884 @@
                 # if message we have in message_textview is too big
                 if requisition.width > message_width:
-                        self.msg_scrolledwindow.set_property('hscrollbar-policy',
+                        self.msg_scrolledwindow.set_property('hscrollbar-policy', 
                                 gtk.POLICY_AUTOMATIC)
                 else:
-                        self.msg_scrolledwindow.set_property('hscrollbar-policy',
+                        self.msg_scrolledwindow.set_property('hscrollbar-policy', 
                                 gtk.POLICY_NEVER)
 
@@ -918 +917 @@
 
                 if not len(gajim.events.get_events(self.account, jid, types_list)):
-                        return
+                        return 
                 if not self.parent_win:
                         return
@@ -925 +924 @@
                 self.parent_win.window.is_active():
                         # we are at the end
-                        if not self.session.remove_events(types_list):
+                        if not gajim.events.remove_events(self.account, self.get_full_jid(),
+                        types = types_list):
                                 # There were events to remove
                                 self.redraw_after_event_removed(jid)
 
         def redraw_after_event_removed(self, jid):
-                ''' We just removed a 'printed_*' event, redraw contact in roster or
+                ''' We just removed a 'printed_*' event, redraw contact in roster or 
                 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)
-                        groupchat_control = gajim.interface.msg_win_mgr.get_gc_control(
+                        groupchat_control = gajim.interface.msg_win_mgr.get_control(
                                 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)
-                        if groupchat_control.parent_win:
-                                groupchat_control.parent_win.redraw_tab(groupchat_control)
+                        mw = gajim.interface.msg_win_mgr.get_window(room_jid, self.account)
+                        if mw:
+                                mw.redraw_tab(groupchat_control)
                 else:
                         gajim.interface.roster.draw_contact(jid, self.account)
@@ -955 +956 @@
 
         def sent_messages_scroll(self, direction, conv_buf):
-                size = len(self.sent_history)
+                size = len(self.sent_history) 
                 if self.orig_msg is None:
                         # user was typing something and then went into history, so save
@@ -1053 +1054 @@
                 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')
@@ -1080 +1081 @@
                 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
@@ -1126 +1127 @@
                         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()
 
@@ -1154 +1155 @@
                 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:
@@ -1164 +1165 @@
                         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'''
@@ -1176 +1177 @@
                         menu = gtk.Menu()
                         menuitem = gtk.ImageMenuItem(gtk.STOCK_SAVE_AS)
-                        id = menuitem.connect('activate',
+                        id = menuitem.connect('activate', 
                                 gtkgui_helpers.on_avatar_save_as_menuitem_activate,
                                 self.contact.jid, self.account, self.contact.get_shown_name() + \
@@ -1183 +1184 @@
                         menu.append(menuitem)
                         menu.show_all()
-                        menu.connect('selection-done', lambda w:w.destroy())
+                        menu.connect('selection-done', lambda w:w.destroy())    
                         # show the menu
                         menu.show_all()
@@ -1268 +1269 @@
 
         def draw_banner_text(self):
-                '''Draw the text in the fat line at the top of the window that
-                houses the name, jid.
+                '''Draw the text in the fat line at the top of the window that 
+                houses the name, jid. 
                 '''
                 contact = self.contact
@@ -1276 +1277 @@
                 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:
@@ -1363 +1364 @@
                         self.gpg_is_active = False
                         msg = _('GPG encryption disabled')
-                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
+                        ChatControlBase.print_conversation_line(self, msg, 'status', '', None)  
                         if self.session:
                                 self.session.loggable = True
@@ -1388 +1389 @@
                 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):
-                '''Set lock icon visibiity and create tooltip'''
+                '''Set lock icon visibiity and create tooltip''' 
                 status_string = enc_enabled and 'is' or 'is NOT'
                 logged_string = chat_logged and 'will' or 'will NOT'
@@ -1549 +1550 @@
                 # True refresh 30 seconds vars too or else it's 30 - 5 = 25 seconds!
                 self.reset_kbd_mouse_timeout_vars()
-                return True # loop forever
+                return True # loop forever              
 
         def check_for_possible_inactive_chatstate(self, arg):
@@ -1601 +1602 @@
                         ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
                 self._show_lock_image(e2e_is_active, 'E2E', e2e_is_active, self.session and \
-                                self.session.is_loggable())
+                                self.session.is_loggable()) 
 
         def print_conversation(self, text, frm='', tim=None, encrypted=False,
@@ -1625 +1626 @@
                                 if not encrypted:
                                         msg = _('The following message was NOT encrypted')
-                                        ChatControlBase.print_conversation_line(self, msg,
+                                        ChatControlBase.print_conversation_line(self, msg, 
                                                 'status', '', tim)
                         else:
@@ -1631 +1632 @@
                                 if encrypted and not self.gpg_is_active:
                                         msg = _('The following message was encrypted')
-                                        ChatControlBase.print_conversation_line(self, msg,
+                                        ChatControlBase.print_conversation_line(self, msg, 
                                                 'status', '', tim)
                                         self._toggle_gpg()
@@ -1672 +1673 @@
                         unread = '[' + unicode(num_unread) + ']'
 
-                # Draw tab label using chatstate
+                # Draw tab label using chatstate 
                 theme = gajim.config.get('roster_theme')
                 color = None
@@ -1700 +1701 @@
                 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()
@@ -1719 +1720 @@
                 # 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(
@@ -1760 +1761 @@
                 muc_icon = gtkgui_helpers.load_icon('muc_active')
                 if muc_icon:
-                        convert_to_gc_menuitem.set_image(muc_icon)
+                        convert_to_gc_menuitem.set_image(muc_icon) 
 
                 ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
@@ -1774 +1775 @@
                 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\
@@ -1814 +1815 @@
 
                 # connect signals
-                id = history_menuitem.connect('activate',
+                id = history_menuitem.connect('activate', 
                         self._on_history_menuitem_activate)
                 self.handlers[id] = history_menuitem
-                id = send_file_menuitem.connect('activate',
+                id = send_file_menuitem.connect('activate', 
                         self._on_send_file_menuitem_activate)
-                self.handlers[id] = send_file_menuitem
+                self.handlers[id] = send_file_menuitem 
                 id = add_to_roster_menuitem.connect('activate',
                         self._on_add_to_roster_menuitem_activate)
@@ -1826 +1827 @@
                         self._on_toggle_gpg_menuitem_activate)
                 self.handlers[id] = toggle_gpg_menuitem
-                id = toggle_e2e_menuitem.connect('activate',
+                id = toggle_e2e_menuitem.connect('activate', 
                         self._on_toggle_e2e_menuitem_activate)
-                self.handlers[id] = toggle_e2e_menuitem
-                id = information_menuitem.connect('activate',
+                self.handlers[id] = toggle_e2e_menuitem 
+                id = information_menuitem.connect('activate', 
                         self._on_contact_information_menuitem_activate)
                 self.handlers[id] = information_menuitem
@@ -1885 +1886 @@
                 # 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
@@ -1914 +1915 @@
                         return
 
-                # if the new state we wanna send (state) equals
+                # if the new state we wanna send (state) equals 
                 # the current state (contact.our_chatstate) then return
                 if contact.our_chatstate == state:
@@ -1926 +1927 @@
                         # for that procedure so return to make sure we send only once
                         # 'active' until we know peer supports jep85
-                        return
+                        return 
 
                 if contact.our_chatstate == 'ask':
@@ -1946 +1947 @@
                         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':
@@ -1963 +1964 @@
                 # 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)
@@ -1991 +1987 @@
 
         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:
@@ -2180 +2174 @@
                         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
-                # Is it a pm ?
-                room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
-                control = gajim.interface.msg_win_mgr.get_gc_control(room_jid,